projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 518eab2 c4ade11)
Merge from origin/emacs-24
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 3 Mar 2015 22:52:04 +0000 (14:52 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 3 Mar 2015 22:52:04 +0000 (14:52 -0800)
commit98284ef51c67fa69796946466337d426ab81f9ee
treee43f8d3ab77f67a2fca1dd016037693674b91c26tree | snapshot
parent518eab2f7db71929e4877daa5ebd06b1416e69e6commit | diff
parentc4ade119ccd1904795b2e8d76cd93aedc86d1b09commit | diff
Merge from origin/emacs-24

c4ade11 textmodes/ispell.el: Look for aspell .dat files also under dict-dir
e28ec9a ispell.el: Extend to aspell current hunspell handling of aliases

Conflicts:
lisp/ChangeLog
admin/ChangeLog diff1 | diff2 | blob | history
doc/lispref/ChangeLog diff1 | diff2 | blob | history
doc/misc/ChangeLog diff1 | diff2 | blob | history
etc/ChangeLog diff1 | diff2 | blob | history
etc/NEWS diff1 | diff2 | blob | history
etc/NEWS.24 diff1 | | blob | history
lisp/ChangeLog diff1 | diff2 | blob | history
lisp/erc/ChangeLog diff1 | diff2 | blob | history
lisp/textmodes/ispell.el diff1 | diff2 | blob | history
src/ChangeLog diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.